Edited for Love 0.9.0 compatibility