bug fixes regarding last commit