~ bug fixing