Attempted temporary fix for #4