Fixed wrong behaviour