Comment out possible bug source