Temp fix for #27
Fix #3