removed on_available, fixes #8