Fixed bug in support