Fix for issue-563
Fix for issue-563

stuartf/Hilary,simong/Hilary,ExC0d3/Hilary,simong/Hilary,mrvisser/Hilary,Orodan/Hilary,mrvisser/Hilary,jfederico/Hilary,ExC0d3/Hilary,nicolaasmatthijs/Hilary,timdegroote/Hilary,nicolaasmatthijs/Hilary,jfederico/Hilary,timdegroote/Hilary,stuartf/Hilary,Orodan/Hilary