Fixed my part of issue #48