Could you please specify when this started to happen ? 

Most probably it's already fixed in UNA 11, however it still in beta, but it's pretty safe to upgrade. To upgrade you need to switch to 'beta' update channel in Studio > Developer (install this module if this isn't installed) > Setting > Update Channel