Fixes Issue Â#1755