Added temporary fix for #13

Relates to #13