Bugs/1483b

Fix for Issue #1483