Fixed removed changes due to forgotten update from github