Fixing 4444 master

fixes #4444 

@kabum @bantu @ringmaster @butonic THX