diff --git a/app/controllers/fullcalendar_engine/events_controller.rb b/app/controllers/fullcalendar_engine/events_controller.rb
index c32e043..897adc7 100644
--- a/app/controllers/fullcalendar_engine/events_controller.rb
+++ b/app/controllers/fullcalendar_engine/events_controller.rb
@@ -23,10 +23,15 @@ def new
     end
 
     def get_events
-      @events = Event.where('starttime  >= :start_time and 
-                            endtime     <= :end_time',
-                            start_time: Time.at(params['start'].to_i).to_formatted_s(:db),
-                            end_time:   Time.at(params['end'].to_i).to_formatted_s(:db))
+      start_time = Time.at(params[:start].to_i).to_formatted_s(:db)
+      end_time   = Time.at(params[:end].to_i).to_formatted_s(:db)
+
+      @events = Event.where('
+                  (starttime >= :start_time and endtime <= :end_time) or
+                  (starttime >= :start_time and endtime > :end_time and starttime <= :end_time) or
+                  (starttime <= :start_time and endtime >= :start_time and endtime <= :end_time) or
+                  (starttime <= :start_time and endtime > :end_time)',
+                  start_time: start_time, end_time: end_time)
       events = []
       @events.each do |event|
         events << { id: event.id,