Fixed: order was important
Improved logging