Fixes issue with local and server elements enhancement

Fixes #581