Removed dev limitation