Temporary fix for (#739)