Fixed Bugs "27, #102, #103, #104