This should make it work properly