This issue has been resolved already, is however not yet integrated into the default branch. If you would like, you could opt in on the beta. There are quite a few changes compared to the default branch, so you might want to inform yourself of the features we are currently testing first. Keep in mind, when you started a galaxy in the beta branch it is not possible to convert it back to the default branch.
Alternatively you can wait until we release the patches to the default branch.