Fix for 1.5 compatibility (issue #1)