Comment until hanging on start is fixed