urgh... v hard to test this...... #37