+ bug fixing