Bug Fixes, currently not working