1.5 hotfix 2

Non-critical optimization