Fixed bug in a1ac87ff2cb1fef634e0d4104a51dcc8747d8af1, #934