Fixed issue (#26) for real. Previous commit fixed (#25)