attempting fix for #179, @barisusakli can you pull and test if this is still present?