Making release & dock more robust (ex 1.)