rolled back to 0.2.5c