Hopefully last small "bug" fixed