Think this should make it work as expected.