Fix for Issue #46 in backend