Update for 2.4 - fixes #1