fix #5 (really this time?)