#30 Fix compatibility issue