Add temporary fix for conv-problems