make it behave a bit better ..