Last fixes, works now as expected