better dock handling