Actually fixes previously mentioned problem.