fix odd behaviour