Fix for #18 didn't work.