Fixed the usual bug