Bug fix #49 - CLOSED