Trying to fix #36
Fix #36 in master