Fix #29 (hack only)