Fix for solution to #36