Fix to Bug #24